Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Wed, 10 Feb 2010 09:34:18 +0000 (10:34 +0100)
committerJan D. <jan.h.d@swipnet.se>
Wed, 10 Feb 2010 09:34:18 +0000 (10:34 +0100)

Trivial merge